From 4a04375f4632f900267463e832694467fed09baf Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 23 Feb 2018 17:04:16 +0000 Subject: [PATCH] init scripts: Do not kill per-domain qemu processes. Drop 2nd start-stop-daemon from qemu_stop_real xen init script. Closes:#879751. This code was introduced in 8ad8a8221d9884b76f6942acabd9465e11ca23bd Start a qemu process in dom0 to service the toolstacks loopback disk attaches. Ie the commit which introduced the global qemu. There is no indication that there was any intent to do anything to the per-domain qemus. I think the 2nd s-s-d invocation is there to stop a qemu which is for some reason not mentioned in the pidfile and somehow escaped. That seems like a thing we should try to prevent. I don't think if it comes to pass, that it can be cleaned up without trashing the domUs. So remove it. Signed-off-by: Ian Jackson --- debian/xen-utils-common.xen.init | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/xen-utils-common.xen.init b/debian/xen-utils-common.xen.init index a153885073..3411c15b0f 100644 --- a/debian/xen-utils-common.xen.init +++ b/debian/xen-utils-common.xen.init @@ -235,8 +235,6 @@ qemu_stop_real() start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile "$QEMU_PIDFILE" --exec "$QEMU" RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec "$QEMU" - [ "$?" = 2 ] && return 2 rm -f $QEMU_PIDFILE return "$RETVAL" } -- 2.30.2